GtkScrolledWindow: Add some NULL checks back
authorMatthias Clasen <mclasen@redhat.com>
Fri, 30 May 2014 01:52:40 +0000 (21:52 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 30 May 2014 01:52:40 +0000 (21:52 -0400)
Turns out these were not quite redundant, gtk_container_forall
may be called very early during construction.

https://bugzilla.gnome.org/show_bug.cgi?id=730924

gtk/gtkscrolledwindow.c

index f17d58f28da72ff441956bc5db3edb6f1331745a..9aad13a7f3f9e070ce866245c648adb2b2d2b4a7 100644 (file)
@@ -1664,8 +1664,10 @@ gtk_scrolled_window_forall (GtkContainer *container,
       scrolled_window = GTK_SCROLLED_WINDOW (container);
       priv = scrolled_window->priv;
 
-      callback (priv->vscrollbar, callback_data);
-      callback (priv->hscrollbar, callback_data);
+      if (priv->vscrollbar)
+        callback (priv->vscrollbar, callback_data);
+      if (priv->hscrollbar)
+        callback (priv->hscrollbar, callback_data);
     }
 }